CleanUp

Some house cleaning