Refactor
Fix id