Cleanup imports, update README