Doctstrings and improved url handle