Cleanererer

More cleaning up of  the code, but no real changes.