reordered some variables
reduced extra-filler