comments and func renaming