Made code more clear on Q79