change keys, indent, other minor formatting