Tidy up the usings also.