Organize and clear some aliases