fixed indentations, changed parameter name to lowercase, fixed Singleton implementation to get rid of shadowing