Cleaning up code
Updating code