Final little clean up