tidying
done some more