Created real singletons
Renamed method names
Commented code