Tidying up my last post