refactoring
some android lint fixes