Fix alignment of variable assignments