Incorporated @alanclarke's suggestions