Fix conditional indent and remove ruleset counter