cleaned up for publish