shorten and reorder for clarity