[code] some more nitpicking