Actually committing refactored code, details will be sent by email to relevant parties