Cleaned up last of the review comments after discussing with @jonathanolson, see #3.