#9 minor cleanup