Uniformize initialization logic