Major refactoring
Update tube.txt
Minor refactoring