1. Using spaces rather than tabs for indentation.
2. Move some constant fields to ProviderHelper.java.