Improve source.py