some consistency/style reformatting of do/forall/conditional expressions