minor changes, to conform to lint