I amended the commit to apply your suggestions.