Fix error class name
Reformat
Update scope added