fix comments and refactor on some parameters names