63 minor cleanup