Isolate toml code and split up concerns