Cleaned up, reviewed, and commented

Removed some unnecessary facts and one rule, and also fixed the
corresponding goal. Added comments to goals.