Attempt to make MainActivity.java smaller and improve load time