REFACTORING: Minor changes 1