Once again - clean up checkstyle and code warnings......