Defined launching intents and cleaned stuff up