Standardize variables in accordance to PR #59