Cleaned up code
No chunking for UDP