Minor code clean up

Just some minor code clean up based on the errors outputed in Code Analysis in Android studio. :)