Simplify one function and improve option wording. Signed-off-by: John Mulligan <jmulligan@redhat.com>