Fiddling with styles

Signed-off-by: Levi Tan Ong <levi@byimplication.com>
Various styling fixes

Signed-off-by: Levi Tan Ong <levi@byimplication.com>