Apply the code review comments

Conflicts:
	src/node_file.cc