cohort fix, some style cleanup

Change-Id: I8baa0b5111a6f9338040daee49a875d948f11e23