Another refactor to end the night