fixed many checkstyle warnings