Lots of styling

Signed-off-by: Mark Somerville <mark@crocodile.is>