Minor tidying comments and var names