Cleaned regular expressions and improved comment removal algorithm