Just a tad bit more clean up