Made some minor changes to clean up the schema generator tool