Some restructuring & tidying up