Checkstyle fixing