better handling of this variable usage