Formatting cleanup of NHSFileController