Minor clean up of #130