refactor variables
moar variable refactors
use the node/container bootstrap wrapper methods