Minor init cleanup