Simplify the <480 code