small impl improment