Remove the max call
Update doc strings