Refactor cluster.cc
Fix constructors
Remove old initalizing code
Fix indents
Merge pull request #70 from yayugu/small_fixes

Small fixes