Visual changes. Better regex-ing.