Adressed PR comment's