bit of cleaning up after the major refactoring