some "code inspection" clean-ups