Some cleanup; Enterprise type was added