Clean code
Improve code coverage