organized, shortened some aliases