simple clarity cleanup