Improved return to be properly formatted hash