Code review. Adding comments

This closes #3