More formatting improvements

@kevva there you go ;)