Fixing checkstyle problems