Refactor, sort comments and add commit comments