Fixed Android Lint issues, some code cleanup