Clean up

For this apparatus to work as a template it needs to be cleaned up.