More clean up. Ready for review