Clean up some mypy errors by adding real return statements

Clean up some mypy errors by adding real return statements #61