Removed Magic Number Violation