Refactoring
Update