Refactored code for better consistency in naming, and cleaner methods for the van.