Refactoring
update