Minor clean up #151