Code quality improved and working tree cleaned.