Renamed Company name and updated class check to something more efficient.