cleanup stuff
refactor