refactoring in protocol panel