Better code style + PS2

It's now easier to track code blocks