small cleanups -- fixes #223