Refactoring and Updates