Cleaning up Service and Webapp code