Clean for Publish
Clean up code
Clean for publish