Cleanup and comments for service classes