tidy
touch up changes