Cleaning more up
More tidying