Format

Thought these branches wouldn't merge :(