Followed feedback and suggestions from @willnorris.