Update style to match @laszlopandy's upcoming recommendations

The idea here is to use a more regular code style, based on 4 space indentations.