Cleaned up the operator regex, and fixed some alignment issues.