edits, clarified scope
refactored
refactored