Cleaned up for publish.