Formatting tidy-ups

Signed-off-by: Joe Stringer <joestringernz@gmail.com>