Client code now has reduced comments