Flattened out the last case block