Cleaning up
More tidying