Checked with Checkstyle, refactored