Cleaned up WolframAlpha-related code