Moved around some of the type hints