Tidied up imports

Much tidier like this. No more DRY violations!