cleaned up the file a bit more