Incorporated feedback from @nschoe