minimal cleanup
regex cleanup
some more cleanup