refactor, refactor, refactor

all we do is refactor