cleaned up MainActivity