app architecture updated. garbage values resolved

garbage values were spotted by code analyzer.
conflicts were resolved