cleanups after messing around with #176