Refactor
Add check