[WIP] Code formatting

I'll try to find more of those unused variables when I'm back from the bike shop ;)