simplifying and editing