code inspection cleanup continued (196 pending)