Minor cleanup of payload module