SQUASHME: Addresss more comments