small code fixes
another import cleanup