some cleanups after #186