Clean up Init

Some constucts with defaults, init order and misc