Fixed comments from Gabriel