*: proto refactoring