Clean Up of code