Clean Up and Refactoring Code.