Improved Singleton + Warning Cleanup

Hey hey,

I made some slight adjustments to the code. Hope this helps!