* Removed unnecessary try-catch
* Fixed formatting