Improved comments; other improvements
Tidy
Tidy
Tidy