Cleaned up some code.
Hope I didn't break anything.

[PATCH attached]

Per Persson
per.persson@gnosjo.pp.se