Refactored (extracted constants)