A little clean up in the code