Clean Up, will work on more, when ready.