Little more clean up