improvements regarding checkstyle and Code coverage
improvements regarding checkstyle and Code coverage