Removal of id column (dirty) and minor tidying