Some cleanup in the type enforce file