Simplify code for 82