Formatting, etc from comments from @ICRuby and walking through with @DariaNico