Apply all review comments from jmmv