removed region fall through and renamed typedefs