variable/spacing fixes