Let's make this read a little better.
Closes #428