Starting to clean up a little

Signed-off-by: Nick Lambourne <nick.lambourne@gmail.com>