cleaned up code

* removed ostrich requirement
* renamed @side to @concern
* removed extraneous variables