Ditch regex and comments in favour of more descriptive ruby methods