Code cleanup and formatting, documentation and moving all configuration into the consumerProps.