[DF-4399] Fixes related code review notes. Code optimization and simplification.