Added more facts
Simplified code
Finished code