Fixed more checkstyles