Mostly finished with errors.core refactoring. Mostly readability changes at this point