Just cleaned up the MainActivity