[IN] Refactoring