refine filenames and comments in code