cleanup
refactor all the things
update