Major refactor

- Clean up method names and style
- Remove XmlResult, from now on `handle_errors()` will deal with
  all error related matters