Checkstyle template modification pack #1

List of wanted/needed changes for checkstyle template: