stylistic changes
towards removing redundant closure-state