refactor tube population for clarity