Code styling 2

The other changes are kind of acceptable, this actually makes the code harder to read and less structurized.