Cleaned up onButtonClicked code for main activity
Cleaned up onButtonClicked code for main activity