Refactored some things
update