file.cpp - small cleanups