Rearranging some things to make toml output more friendly