Clean up least a bit.