Improve code quality (according to PMD)