Cleaned up the MainActivity