Comments reflected Ruby inheritence. Simplify regexp.