Cleaning

More cleaning and working things out