Refactoring some function and var names.