Rearrange + clean up + add few aliases