small rearranging and renamings