Improved comments
Using an entry-point class is typical best-practice