Refactoring and additional logging