refactoring, edits