Removed company references and simplified things