Refactored source