Thanks for testing and reviewing. I did some cleanup and pushed the changes.