some comments and parameters renaming