WIP2: refactoring cluster startup code