Implement @parkr's suggestions