A little clean up
More clean up