(#92) - clean up multipart parsing