Cleaned up fish functions and bash aliases