It would definitely look cleaner, I started that way but thought I could keep it very few lines. I did not extracted to another class because I figured it would make it even slower, do you think it is a good payoff?