#checkstyle bugs fixed