Add spaces
Minor changes
Remove unused constants and variables
Go back to using the pkthdr timestamp
remaining changes