Did some minor tidying, and added some consts