012: Refactoring, adding company.name as constant and changing the use of it everywhere