Clean code
Add new test