Another code cleaning.

I hope it now doesn't look so terribly ;P