Refactor to remove checkstyle and pmd issues
Remove redundant code
Little refactor app build.gradle