adjust spacing, remove use-base variable