Version 2.0

Nailed it.
Definitely cleaner!