Clean code
Update tests