Address PR comments, fixing one staticmethod