Refactor Source Code