Finished the refactored code finally.
Merge remote-tracking branch 'origin/master'
Finished the refactoring.