Apply comments from Marcos