Improved comments parsing