GetOpt formatting improvements