Fixed cluster code from comments