Comment by sushid

Looks like your refactor could use a test or two :p