variable scope improvement

include function / mixin arguments in body