Added specs for company, cleaned up some code