Code cleanup

r?
huh, we have a lot of this in sumo. I guess it is something we need to fix too?