Cleaned up some in MainActivity.