Code Cleanup

* Small code cleanup (idendation)
* Using except instead of only.