Add comments
Merge pull request #244 from my-personal-forks/refactor

Add comments