Tweak API formatting.
Clean up.