made some code changes to add Company
refactoring code
:wq