ENH: better var names + tiight_mask -> mask