Refactoring: TCP packet subject to Protocol enum
More refactoring and cleaning up