add no-arg functions and use those instead of storing in local var
add no-arg functions and use those instead of storing in local var