refactor variables for underscores