Refactored source code.