Removed Magic Number Violations by implementing an Interface