Cleaned up main activity class