Style clean-up
Fixed context binding, optimized update binding