REFACTORED: Minor semantic refactor