Address review comments, generally be more descriptive