Client style update + update comments place. :)