Update
Small refactoring