Tube method cleanup.
Forgot to submit this earlier, so other changes may also have been made.
Code still compiles and runs as expected.