a few leanups -- Bernhard Fischer