cleanup and organize aliases/completions