Cleanup, remove unused method
Extract class SourceUri
Use self for Source