Cleaned up language...