Remove unused return variable
Normalize errors