minimal comment refactor