Clean up

Possibly ready to be merged into 0.4.