WEJ-15 Clean up initial code before converting to Angular
Merge pull request #7 from jasondoc3/pre_angularify_cleanup

WEJ-15 Clean up initial code before converting to Angular