a little clean up :P