[WIP] Refactoring & transform method