Improvements

Trying single line
Renamed error code variable