Prefer init list and add missing initializations