Rearrange calls to compile for clarity