Made a final check and re-factored code.
Merge remote-tracking branch 'origin/master'
Made a final check and refactored code.