Initial cleanup
Add packet decoding