Clean client side code