cleaning up regex and setup