clean up

decided I should likely work with NEF as we need a bit more complexity
to represent this system than expected