Reorganization and commenting of Facts class
Fixing merge conflicts