Major clean up
Small changes