refactored some things