This cleans things up and simplifies a lot of the code. Also it's easier to just import one error package when needed.