Cleaned up for publishing