Minor refactors
Simpler initializer for some models