tidy up, using more regex