PR for code review

used return true and return false po