[WIP] Code style

Work in Progress.

Don't merge yet