Feature/cleanup

Modified services, unit tests.