Update to support graphite-api
Fix formatting