Consolidated Simplification

Here you go. All in one update ;)