fix indent, rename Handler, Singleton
fix variable name