I43: Implement comments
Fixed comments for commit 2cf583c3d5525ab742251da3c7f4a44661220063