Couple of minor clean up items

Great little gem.
Just two quick changes to get it up and running again.