Refactor of the refactor