Make unpacking code clearer