Some tidying/restructing