fix flow in home-ready #comment PB-719
refactoring & commenting.