Fixed more checkstyle problems