Refactor, fixing Source Analysis