Suggested refactoring