code cleanup
broke out utils
too many regex