Refactoring

And we also added failing tests for eol/nested comments.