minor service cleanup.

- Switched to the factory style of service creation
- fixed minor formatting issues
- renamed 'socket' service to 'SocketService' to conform to naming conventions.