#561 refactor comments on code