Better method naming and merged regexes together