Refactoring fixed