Cleanup

Tidied up a few small things on to make way for refactoring the geometry chunks.