Hot: refactor