sexier regex, fix bad merge
cleanup