Cleanup according to feedback from @dantleech - thank you