Address PR comment's