Cleanup the Storm API a bit