Simplified code
Simplified code
Typos