Removing some of the unnecessary partials.
Removing more unnecessary nesting.