Refactored code and added error handlers
Refactored code and added error handlers
Minor indentation changes
Minor indentation changes
...