cleanup, modularization, additional check on service start in
MainActivity