holy refactor