Refactored with proper naming scheme