Yeah, there is a lot of this that I glossed over. I was more concerned with functionality for this release than cleanup, but we can discuss more cleanup passes.