#comment: refactored source