Fix violations reported by checkstyle