Great feedback, pull-request updated as per suggestion.