Refactoring var names for clarity