Refactored to proper name