Fix bad regex for operator detection
Add classes for the code
Fix incorrect comment handling