Remove break, Fix Type