[WIP] Consistency tidy up

This PR just tidies up use statements.