Tiny cleanup...

I really have to do a large cleanup later...