Minor cleanups (#30)