Simplified slightly.
More slight changes to simplify.