Cleaned up code, added announcement for feature enable/disable