Update style to match @laszlopandy's upcoming recommendations

The idea here is to use a more regular code style, based on 4 space indentations. Can we share the draft with Max, I don't know if it's viewable if you have the link?