Cleanup and minor linting fixes

Just simple stuff while I'm getting familiar with the project. These come from the gradle linter and the AndroidStudio linter.