cleaning up, making regex more legible