improvements regarding checkstyle and Code coverage