Add some comments
Refactor