Minor. Rename `type` and make formatting more consistent