Pep8
Remove useless try-except clause
Improve testing coverage