Beginning cleanup of original script, for old time's sake.