Reorganization and commenting of Facts class