minor refactoring/cleanup

removed some println!'s and unmasked payload in-place, instead of allocating
another vector.