- Changed name of Singleton class to indicate that it is a Singleton
- Added some clarifying comments
- Deleted unnecessary property