Refactored with Helpers