Cleanup and normalization of functions handling secrets

also now using a dash - after print and gettext options to avoid
parsing printed strings as options.