more cleanup/simplification