Added typeInitMap default for defined types.
Fixed inconsistent spacing. Added defaults.