Reorganize some of the variables