Removed Magic Number Violations