Removed extra line break

Refactor Company generator to use name formats
Refactor Company generator to use name formats