Fixed more checkstyle warnings