Updated and simplified

[none]