Improvements to Code / Clearing