renaming services to avoid potential conflicts
some formatting and cleaning up
refactoring some code