Code review cleanup of file.