Ran some standard Androidstudio checks and resolved some warning