Clean up a bit
Import