Cleaned up MainActivity