Removed trailing whitespace.  Changed Cluster references to const.

This commit contains 2 changes.  First Clusters are now const,
this seems correct as no editing of the clusters should be done
as they are just read from a file.  I also used a script to remove
trailing white space.

Change-Id: I165c2121c1a19131c8aac3d9a9c211e91281453c