Tidying things up a little while I think