Changed class name and removed string