more constructor cleanup