Code cleanup, documentation and tests
Started service