wow. such refactor