Updated some code following PMD default remarks
Updated some code following Checkstyle default remarks