wow, such refactor