Tidy up

Signed-off-by: Robbie Boyd <robbie.c.boyd@gmail.com>