better function name + minor tweak