Suggest refactor