Client side: Refactored suggestion