QUICK CLUSTER: Improve error messages and coding style.