Suggest refactoring