more constructor cleanup ;)