cleanup, name changes, output formatting