SQUASHME: apply comments