decrease payload char buffer 48->42

and some cleanup