Refactoring SourceCode