Code style

I'll sort out the actual code in a later commit!