fix import (I think)
minor cleaning