Improves var align and fixes misplaced else/elseifs