A little bit more clean up