A little clean up
A little more cleaning