[RFC] Refactor