fix
Refactoring 3