curlybraces

moved some of the opening curlybraces one line up improving readability
(for me)combinded with colapsing