General refactoring and fixes of lint issues
Add missing final specifier
Merge pull request #52 from mikesname/master

Minor web service refactoring and fixes for lint issues flagged by Jenkins