Formatting/terminology tweaks; OPTIND bookend tidy; rm unused array