Better readability
Handle multi line comments properly