Error in code
Another Code cleanup