info: refactoring