Minor tidying & comments