Tidy up

Signed-off-by: Toby Steward <toby.steward@gmail.com>