Clean up ClusterConfigParser

Just some refactoring and small improvements to code quality and cleanliness.