Expressive code

Comments below.
@davidames1983 I forgot to tag you in the comment above... so I'll tag you here.

Feel free to merge this if you would like.