improve clarity in some functions