discovery refactoring p2 - comments & prepare following updates