Re-formatting and adding inline comments/thoughts