1. Proper Exception handling
2. Renaming of a few variable names