Some aestetic cleanups
Try to merge similar fudges

Unfortunately, I have to throw out linking for now, until I come up with
a better solution