Small update, refactoring