Refactored ActivityController and ActivityService and simple clean up
Clean up and notes