Some tidying up and minor restructuring of latex lab