tidyup
merged changes
Merge pull request #18 from phillip-haydon/ProgramRefactoring

Program refactoring