Address review feedback
Add inline documentation