Fixing derpy scoping workaround
Adding some whitespace and return type annotations