Adressed PR comments