2434: refactor