Refactor code, data oriented