Refactoring, Clean Up, and Updating