Fix the system and add checkstyle