Restructured + commented code
Resolving merge conflicts (THANKS FOR THE GIFT)