Rearrange

Had to rearrange methods so the name variable would be cleared (if
needed) before it was displayed.