[Alias] Rearrange some code

Neater this way.