Fixes some code uglyness

Of course, I must do this, before I even start to try to work on this.