Cleaning up code ...