I don't mind having this here explicitly, but I think the same effect would be achieved by removing lines 109 & 110?