Rename file + minor cleanup.
README update.