Massive code cleanup
Reverted formatting change
Lesson Builder updates