AVALANCHE: Move/Improve some comments in parser