fix comment de-duplication with new separation of logic