code cleanup
stricken reg exps