Add comments in code
Add tests