easier packet handling
more cleanup