Services and unit tests
Cleaning up comments