Refactoring, update