cleaned up some code

Should be logically equivalent.
I can remove the facts change if adrian does it in his branch.