reorganize some things