Cleaning up some code
...
...
...
...