Refactor
Fix structure