Removed duplication in company construction. Solved a bug in which companies where not created properly when finding them