fixed class name and cleaned parameters