Cleanup of Scratch.py