replace the use of goto with a fallthrough instead