comments and cleanups (service main)