Fixed some messages reported by Checkstyle