Removed intermediate step in starting the app, cleaned code a bit
Removed intermediate step when launching service