service is working, time to clean up code