Build #45:   refactor code on branch dev over 10 years ago