Style update
Remove redundant exception handler