cleanup
Small changes