Fixing my refactoring