Rearrange
Switch out self typehint for name