refactor abd comments