Correcting refactor