I think I have corrected most of the divergences but I am still concerned about docstring especially. For example, Docstrings should always be placed direct