CheckStyle added, code refactoring. Need to add a package-file.info