General tidy

A quick tidy.

Signed-off-by: Michael James <michael.james6@gmail.com>