Cleanup and use sane imports. Importing * is dangerous!