refactor (sorta)