Various clean up
Added error-util