Tightened imports for Control.Error.Util
Polished source code