white space & comment tidy ups