Cleanup Sales a bit and mind contracts!