Refactoring, Clean Up, and Updates