Clean code
Add more test