Refactored how we generate CFGs