Change order of ConsistencyMasterSlave parameters

+ fix indent