Cleaned up the way my aliases are organised