Fixes for checkstyle, FindBugs y PMD