style tweaks
Merge pull request #9 from mmmavis/bug-1113826-updated-goal-2.1

style tweaks
style tweaks
Merge pull request #10 from mmmavis/bug-1113826-updated-goal-2.1

style tweaks
Merge branch 'develop'