Just doing some quick tidying up...