Cleaned up for publish