Refactoring and simplifying things a little.
Refactoring and simplifying things a little.