Correcting/Optimizing imports.

While in the process of testing stuff out I
forgot to do an “optimise imports” before submitting
the PR.