Refactored source files
Refactored source files