add comment; actually use helper in view
refactor regex, cover different cases