remove empty constructor, fix null companyId bug, some other refactoring