Tidied up a few loose ends
This iss feeling a bit uphill both ways...