Cleanup and file comments added to some files