Dealt with checkstyle. Fml what a mess