Cleaning up my client side helper