cleanup based on feedback from @kkoppa