Refactor member access (rename some vars and functions)