More clean up and a minor correction