Fixes y refactoring