Cleaned up Log statements and implemented reuse of Intents