Clean up

See #6