Tidied things up a bit

There’s still some more to clean