Housekeeping

I liked your code, and I thought I may give it a little hand to make it prettier :)