Fix indentation
Remove unused exception
Little fixes