made vars more concise