Small refactoring (first part)