CS & review fix