Simplify client side code