Went through the GUI code, and cleaned that up as well. That included refactoring three different classes into 1 since it was clear that only one of the three did anything significant and there was no point separating the other two that did almost nothing.