Comment MainActivity and Cleaned up Code