Clean up code
Add solutions in python, scala