Clean up

Make things less insane.