a bit mroe cleanup