all edits. Refactoring, ept