fixing regex pattern
cleaning up