Cleanup with Android Lint
Cleanup