Cleaned up the Makani entry slightly.