Simpler singleton design
Removing unused variable