little bit of cleanup

* checking records are actually getting created / destroyed
* simplify creation where possible