Minor tidy up of usings