steward: refactoring