refactor. whew.