Minor refactoring of vanilla create cluster

Change-Id: Ice01a53bfc623a5d50497e6365b04a74e7ecd427
Merge "Minor refactoring of vanilla create cluster"