Refactor comments to be more precise