Uncomment enabled and availableLocales fields
fix some coding style