Tidying things up

Signed-off-by: Kai Howells <kai@automatica.com.au>