Fix align & order of variables