Fixed break; vs continue; & code cleanup