better code style
removed Singleton decorator - backward compatibility