improve per the comments by client