Minor tidies to conform to standards