organize aliases better