Code cleanup, move to time.Duration for -quiet