Shortened, made better