Clean up a tad