Cleaning up code
...