[MIN] Eclipse and Checkstyle warnings resolved.