Cleaned up regexes and spaces in comment parsing