Prot: refactoring
Cleanup