Neater packet handling