Cleaned up some functions in .aliases