Just refactoring...