File rename
Minor comments