Fixes issues reported by CheckStyle and PMD