Rearrangement of attrs,docstrings changes