Minor cleanup to code. Decoding still hopeless.