Smaller refactoring