Refactor and Explanation Comments Update