Addressed comments on pull (thanks nlake44!).