Merge "Improving comments in File class"