refactored
refactored some more