Refactored some names based on code review