Refactored SourceTree