Checkstyle problems fixed