Cleanup and docstrings
flakify