cleans up regexp and updates comment