Cleaned it up in new version.