clarity & cleanup