Addressing PR comments and python style