Just some more tidying tweaks to structure