Correcting the refactor