Cleaned up MainActivity + added comments