Improves comment parsing